more mapping support (#7)