Additional changes to our homework 5 (key-value store)