Use proper APIs for table manipulation