Slight redesign to the database.