Tweaking WarehouseSession implementation