Fix model property embedding