Incorporate PR comments, rename properties, add nodes for key-value pair, boolean value, and top level schema