Added persistence structure