Refactor the serialize/deserialize into two functions
Fix the connector resolver to make sure known connectors are used
Create scoped methods for belongsTo and improve docs
Simplify the inclusion processing