Refactored scope out of the generator class
Before callback
After callback
Target is now handled as a lambda internally
Back to the old callback signatures. They integrate better with the upcoming mappings