Using views instead of tables
Merge conflicts resolved