improved State, added more methods to StateBuilder