Changed the design in accordance to the updated schema.