Adding support for @Cleaner annotation