Update wrapper to look like service.