Add Shark Server and Client integration