Added support for diferent SUB mapping