Made Results API more compact