Changed some constants to enums.