Updated some simulator components