Fix tables creation
Sample data fix