Added more to OnLoadConifg