Rewriting some function of the core module to make everything lighter