Refactored listings