finish support for generalized maps