Another API design update!