Enhanced Storage step #5

Made the stored data DynamicTableEntity (dynamic number of columns)
Enhanced Storage fixes