Changed table generation strategy to drop and create