Updated detection of containers