Core now handles location on tables