Modifications on extractCDS class