Fixed the Database

Need to review the Aggregate design