Initial persistence support with short-code generation