fixes Dimas coments on GH
Grouped all variable roles in a dummy class to prevent name hardcoding