Add check when adding new associations too