Added mode to differentiate set/state type features.

Can probably start reviewing this. I still need to add different modes into the dictionary parsing test and make sure everything still passes. /cc @charleso 
Second commit coming to fix this.