added support for non-child links in the model