Accept multiple initial states
Switch to Configurations and States
Fix type bug