Account -> finalize port to new triggers