Change for simplified RetrieveAttribute type