D support added