FileAdapter enhancements