#73 intersects BOPTEST-Service. The purpose of this issue is to make the required changes to service, to incorporate the #73 changes.
