Use maleable structures everywhere they are needed. Add an other possible key for queries. Fix a spelling mistake