Changed defines to consts