Added a auto completion for service