Add proper storage handler.