Added support for next_count