Mock SAS enhancements