Add types for performance