Added conditional inclution of mapping funcs