Improve multi-service environment API