Added --containers command line flag