Changed to Simple Factory
Update