Added application and message types