add execution time for later optimizations
add caching for table remapping