Enh views refactor