Database restructure for more freedom