Add more default views
Chg add relation check, small refactor