Still trying to fix broken plugin loading, not working yet