Separate components for old and new generator implementation