Rewrite storage to use user objects