Implemented 2 levels InfiniSpan based storage