Issue #164 - Use includeSuperClass boolean for keyId property