Removal listener now supported