Added FactoryGirl functionality