Updated for Docker