Adding extra functionalities