Changed models
Merge branch 'cctodb' into stage