Major changes for MYAnimalFactory