Metadata moved to model classes