Rework service spec using new features again.