Adding additional types

Relates to https://www.pivotaltracker.com/story/show/80642554