renamed options to mapping
fixed to work with mappingBuilder