Improved references by Class name too