Added few more features