Use more appropriate data types for SCIDs, direction, composite_index