Proper models..
Updated schema
view updates