MOBILE-561 Reference correct service (extended)