Added custom generator sorting and analytics

- Contributed by Adam Burgess