initial mapping support
More mapping tweaks