Added field Shortname and API Shortname:Set