Removed Enums because they were not working.