Added missing typehints