Simplify adapters by moving touch to FileStorage class