Updated file definitions to be up to date with defined types