Adding persitent storage of target values