Modularize Capture Service