Added few method.. and some required changes...