Added some text features and re-grouped