Modified includes to load after plugins_loaded