Support for both the ORM and ODM modules

[pilsy]

[pilsy]

The support is there now we just need to make the config variables so that it is easy to change this without actually modifying the module