make it work for containers also