Added few more class methods