Resolve references instead of get (BC break)