Added ability to handle multiple projects/containers
Fix a bug that do not closed empty file