Add getRawType, setType and setTypes

Also changed getContent() to use getType()