Changed database struct