Component core added;Refactor;