Added text and bitmap text support