add annotator of instance of yaml calls; switch service resolve from class first to service first