Adding package support to cleaners