Add support for multiple start states