updated schema structure