Cleanup with utility functions
Js Enum definitions - start of base js model