Revert "reverted changes to ConfigDispatcher and restored Java 1.5 compatibility"

This reverts commit d7e96d6e19475761dfe3096621026b18a68d3ba1.
number item support