1. rename map to dict 2. add rehash