Added typedefs for enums