Changed structure of Model and removed dependencies