Half done move to openfilecollection compatibility