Extend 'type' length for future-proofing