Updates to views and Mongo script