Added new listeners