Component generator base. Some improvements.