#3 Added missing typehints