Added product and assembly persistence