Added support for Docker