Add smart splitting