Added new functionalities.