Added class methods