NextMarker support
Refactor
Add flavor for prefix generator