Update code base to replace static call with service call.