Add missing concepts
Merge pull request #20 from cbmi/issue-17

Add missing concepts