recommitting updates to kmaps modules
Updating code to use new subjects.kmap api