Added additional functionalities.