Another minor tweak in attributes to further minimize the diff