Improvements to the Listing extension