Add requirements
Tweak to make nested lists again work as expected