Removed some unused imports
Added host/email session persistence