Added upload schema option
Added matchAll