Improve models gestion