Collection validation improvement and CHOOSE command generator.