Hayward has a leaf trap for the Aquabug cleaner - I looked quickly online and it looks like it sells for about $50. You might be able to find one on ebay cheaper.