[ADD] ServerListener was not being tracked