Added field collection and remote stream wrapper to make file