Guests Refactoring