Put all in new classes for each entry. More clear code !