Added tables to test map functionality