Added support for creating mappings