Replace constants with enums