Added new field in models to differentiate simple and complex embed objects and
providers.
Cleaned up fixture