Updates for SAS compatibility