Moved Guest logic to its own service