Added class attributes