Improved VotesHandler
Split classes in different files.