Added class-based and notify_all