Implemented more DiC extensions