Modularized & Some fix & improvements