Add more security, separate checks, add basic guest support