Add Exception and MapStorage implementation