DIC refactor