Added missing fields to NowAndNext class. Unified property name pattern to *Now and *Next