Added backward compatible, refactored, mappingq.