Add support for Container entities