Added also_known_as support