Added some additional functionalities.