Updated the subscription model (semantic names for id's)