Added control listeners