Add mapping, service refinement, underscore
Start the spec