Updated for 0.0.7 File handling include