Moved dynamic properties from application to container
Fixed typo
Merge.