Design updates for SM