refactored DCI setup and references