Small change to call service directly instead of through ServiceTrigger