Improved Class system