Add feature to allow multiple initial states