Add keepEmpty option