Adds Reference support