Adding mapping builder to ocm
Added mapping builder with test