Fix persistence issue and double creation (still not perfect at all)