Update new design and optimize for rewrite module