improve some relationship management
improve collection handling