Improve type safety