More service edits