LPS-50170 Apply to addAttributes method