Update to latest APEX