Added enums to be part of schema