Modified to be relative inside client/drivers/common