Apex: updates for post-danube