Updated service endpoints implementation

Last version based on third party router implementation