Updated with some more Data table features.