Adding basic Model and Controller support