Added interface
using cleanup