Added tags fields abd DataBase support