Added bufonly and salt syntax.