Add k->gk and j->gj mappings