Move state definitions to ApplicationInfoEx