Attempt to better handle associations and cascading