Add few functionalities