Removed problems with Eventable serialization