Change to support future development