Add sql viewer
merge