Fixing metadata models
more metadata model changes