Some changes in Handler to persistance