Added CaseTypes and ActivityTypes