Better type management