Added service and token classes.