Changed constants into enum