Additional logging
Updated subscribe mechanism