That is very true, but had some difficulties in abstracting them in a single place while things were a bit more unstable. Will try to see if it is possible to merge back into Association