apply dynamic dependency to more places