Changed global structure for model & resources