Added splicing support