Updated Database Structure to be more clean