Update service creation wizard

Change-Id: I70d5682e1ec1ccd158f8e396db7b85347d7ae27e