Aligned with the libraries and aac client