Add String and String[] support