Added DatabaseQueryPlugin framework