Inject instances
Start to add xmls files
Merge branch 'develop'