Fixing associations/fields as of @lsmith77 indication

That was it :) After this one DCOM-96 (#214) is ready to go!