add dynamic mapping support.