Feature/externals v5