Added support for splitting