Changes for future releases