Added shortname/origin fields