Added more class methods