Worked on Database checks
Nightly 0.0.5