Use Apache Collections, load radius from properties, tweak handlers