Added map verification