Changed semantics of choices, implement recursive structures