Added the ENUMS
Some camelCase changes