Add PHPDoc
Refactor UserEventResolver