Added new functionalities and improvements