Changed to use auto_entitylabel