Updated: Type-hint?