[IMP] Improve models and views