Added serving ability and test for connection