json instead xml, fileTypes and other changes