Commit for converting the string constants to Java enums. Closes #9