* Removed deprecated code.
* Added code to allow undefined models.
* Added relevant unit tests.