added db collector and some other changes.