Added target type with first draft of enum