Improve: Config loader and remove duplicated code