Some modification around user subscription