Updated for view categories