Re-introduce filesystem dependency to make loader more testable