Changes for Docker Compose support