Removed old Fields factory
Added DecoratorRepository