[Vivian/Justin] refactored to have conceptType enum
Merge pull request #18 from msvivianso/master

[Vivian/Justin] refactored to have conceptType enum