Added support for multiple "MODEL" objects where everything is starting to be self contained.