modify adapters to use service objects