Updated specification (separated views and models)