Added more character support