IMproved support for signalling the servers