Implement faster session support