Add support for D