Added support for mapping objects