Adapted the enum and its entries to new listing and property macros