Merge #18: Add LIST handlers