Implemented breaking changes for FactoryGirl