Update to newer core and extras modules