Use proper service interfaces