Clean up
Expand DidlHandler