Core: Improved Session