Use key for computing length
Merge branch 'feature/useKeyForLength'