Add more options and improve splitting of text