Moved the attribute functions back to the DSC class.