Containers api improved