Add support for Container entities
Fix container constructor