Updated Factories to have more dynamic data