Modify conditions for configs
Fix annotations
Add method buildContainer()