Move finalizer to be a behavior option