Added more overrides to help process components