Added support for docker containers