Cleanup of views, use inheritance, more data.