Add more support for ODML (issue #1)