Added preliminary support for multiple structures per base command. No UI yet.