Added map drawing