Convent View Rework: Made initial changes to the models