Event sourcing for aggregate roots, refactored annotation handling