Added basic statement splitting