Latest changes to tenant view engine