Added some new functionalities