Added no_avatar. Improved Session management