Fixed so assign_attributes is supported