Use new public modules