Added functionalities and maps