Added some more features which are ready