Start to rebuild support for labeled keys