Added file support, still need to do resolve dispute