Removed dd function
Renamed class