Non-sprint task - minor enhancement: generics added.