Refine some moudles