Updates for Legacy Builds