Moved DataType to @Enumerated(STRING) mapping