- merged database contexts
- added some missing files