master: update code to add with entities (modelsand collections)