Minor functionalities implemented