Added supports for modifying services.
Merge branch 'test' into dev