Added variant and split load code