Add tree-like state definitions