#73 added support for qualified one to one relations