Adjust to new servicescan options