GRID-2 - Removed table prefix