Initiator and Loader improvements