Refactored EFCP and Delimiting. Updated DTCP SV.