Changes according to the new PTS Attributes addition