fix Service Interfaces