Added set container parsing