Updated for 3.0 views structure