Adding universal listener