Added Countable
Renamed event listener
CS fix
PSR-4