File API changes (only affects commented-out code)