Improved the Data Table initiation