#13 Use extended constructor for Holiday entity to reduce code mess