Closes #3: File usage API change