Add the types subscription.
Merge branch '0.1-Subscribe' into 0.1