Add Character/Large Buffer Support