- enhanced DB Support (add,retrieve)
- added Unit tests