Refactored shell for use with FileMap