Changes to use mongo-friendly predictions