Reorganized service interfaces