Removed APPID instances and replaced them with variables