Further improvements to implementation loading