Please review and add these changes to Session and how the Container is stored in it.