Supporting text outside groups

Change-Id: I21f64b37b823f130865a6b62c997cc2f57815983