Added subscribe handling