Add @service (Very slight change)