Added class setting support