Improve the code removing the sotrage_base patch