Added views, and updates schema