Move to richer decode table