Added some more advanced features to complete