Added enhanced file support