Improved level class