Better type support