Refactor with Multivalue object