More class fixes and fix lost data attributes from original input