Added custom generator sorting and analytics