Added chages for Listings 3.4 and 3.5