Add npa, service and rubric modules