Update builder.
Fix bugs in Storage, add a unit test.