Refactoring of system module of framework.