updated structure_with_views.sql