demo updates to support the introduction of Component