Modified Organization to use service