Improved Class structure