Refactor model and schema. Updated controllers and views which are using
the models (especially dates). Might broke a few things