Fix model relations not being resolved when converting keys