Updating views. More consistent column names, additional views