updated schema design