Added views, updated procs