Modified session and user services