Improved support for N-N relationships (the system is now partially functional)