Added enums in all models