Made server more optional.