Improved adbi.model.association