Add dispose logic