Improve documentation
Sync schema member types with query