Simplified code for listing