Added one level mapping support.