Added support for mapping creation