Plugin loading improvements