Refactoring. Changed 'null' role to 'none' to prevent confusion