Changed all infrastructure to support new model