Add components for SAVI demo