Changed to use direct service call