added support for compound keys. There is an issue: had to comment out usage of Cachedmap :(