Improve MapStorage and ArrayStorage