Added text and charShape processing