Support for new enhancements with levels