Fix adding nodes

- Not all necessary subnodes were created
- Fix the allowed children of each type