Improve session mappings