More role class variable substitutions