MappingController improved with RegEx!