Added NullStorage
rework null storage with latest changes in lib.