further work on Map adaptors