Add more fields for service

Change-Id: I37ff2b98cd97bdebf599d5345a45e52bdd80b696
Merge "Add more fields for service"