Enums

Added enums to a few classes to improve readability.