Refator: put map... inside _refs and _values
Refactor: rename make_ref in ref and get_value in value