added detection for container