Improved Main method and augmented Container with status