reworked doapache module ahead of CL requirements today