Refactored skinny session