Necessary changes for compatibility with DViz