Component refactoring done