Fix some issues, add Sura table in DB