Added map code for testing