Add input types for ST-SP*