Updated views architecture