Adapted the file to new listing and property macros