Add Tools for prefixed events, update Loading behavior