Added more criteria
All base data added and supported in basic views
Update views to match data