Add autowrap for unknowns