Recent development.

Complete rebuild of relation support.