Restructure variable loading for extensibility