Added key resolving and GetItem support