updated schema design to handle new types