Improve part matching regexp