Handled subscription and added a unique id to it