Updated to work with new DDO