Added controls handler