Working on dependency stuff in model.