database struct
database struct fix