More type safety