Use ContentFile instead of File, fixes #27