Event creation bugfix and extension of hierarchical functionality.