Future-proof the API a bit