Moved enum to class for consistency and compatibility with binding