Finalizers added