Added class properties