Updated to new relation-modifier format