Update to match dmd changes