Added file buffering capability