Add more supplier helpers
Reduce activator super types
Refactor activity listener core types