Improve notation
Add hashing functions