Adds Target::Server::Generic - ref #17