TableMap improvement