more general regex to match additional mappings