More integration of generators instead of callbacks'