Update to fix component ready and completion status