Improved class variables