Updated to reflect new upstream dragon API.