Make type-aware return