Make Ref work with more than just interface types (#3394)

Make Ref work with more than just interface types (#3394) #585