Reverted to single service approach