Improved DCI class