Updated method wrapper decorator to work clear