Updated generic view