Adding initial guest support