Modifications for Docker