Added some more features