Revise association definitions