Replaced CL_Display with Display class