Worked on Map

Signed-off-by: Adam <aadam.mavridis@gmail.com>