Initial cut at shutdown listeners support