Added enums and tsks