Changed to implement Free wrapper