Better type safety