Should create JIRA to convert to POJO+enum for this