Update the handling of members