Finished support for type changes