Further Db improvements
Further Db improvements