Update type safety