Moved values into handler