More schema changes & fleshing out views