Sort out boundary between services and situations provider