Improved code location
new tables