Added more service protocol functionality part 2.