Refactor: addValues added