Moved Core Logic Data into CDDataModel