Added support for Auto Cleaning