Add some new functionalities