[Domain] Event Logic Fixed