Review: Support ofr modules output