Added string splitting