Change model, added DocumentBundle and EntityBundle