Some new functionalities added.