Changed to handler wrapper style.