Refactor: Define Roles not Classes