Add automatic constant loading