Add some typing, to be sure