In the future (/cc @vieux ?)