Guest Management modified