[WIP] changed mapping from m:m uni to 1:m bi