Enhance for typing