Updates to component bag and scripts