Custom storage

tests have to pass on 5.3 so do not use []