Improvements on Listings + refactoring (adding a listing service)