Added two new listeners, extended UHCCommand.