Added procs, extended views