Enhancements for ATS