Update for type changes