Minor changes for future updates