Fixed punsubscribe event, added additional Subscriber specs