Add containers utilities