Filefield - Some improvements over #85