Update control, add "Complex" handler and test