add support for mapping options