Added focus change listeners to update values