Better service arg parsing