Adding in detection features