Implement unsubscription; Improve control over dates