[code] fixed namespace and add database changes