Made views more generic