Improved status class structure