Updated based on application types