Updated to use base service listener.