Updated subscription model functions