Update to ensure s2member is loaded