Added basic splitting support