Add support for killing server process