Adding schema switch for table design