Moved sorting to registering instead of sorting each Event call