Added enums and excluded types