Adding handler and local