Removed use of ::CLASS