REP-365 Change API to not use Enumeration

Pretty simple, but open to comments.