Updated attributes to match new schema