Data table support

Data table support files added
Multiple changes

Will be described later commit just to maintain upgraded