Added the drugservice adaptation !