Added SOLID views/models