Replaced role by class