Added queries and key-value hashmap