More functional class setter and better visualisations