Refactoring, Component added and more