Types spec and format changes.