Added using samples and sub to all eventTypes