Develop

Move various kinds of metadata conversion out of entity controller to separate classes based on config.