Adding mapping support