Updated addIdent to support kindMap. Modified code to use addIdent instead of addType or addKind where possible