Updates for new trail API.