Rewrite of the core internal components