[Vivian/Justin] refactored to have conceptType enum