simplified targetGenerator and targetGeneratorMap (related to Issue #6)