Enhancement: Add type-hint