changed switch table data model