Use correct service interfaces