Added multi-app support for the client server