Updated to match new schema version
Bug fixes and documentation updates
Updated