database datas goes to config class
merge master