Rider class improvements